From: Ian Campbell <ian.campbell@xensource.com>
Date: Mon, 3 Sep 2007 13:58:35 +0000 (+0100)
Subject: Fix 64 bit build, cannot mix code and data declarations.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14987^2~17
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22Dat/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22Dat?a=commitdiff_plain;h=de73f4ddcadf7bbf031b848859af6496b9bc0db0;p=xen.git

Fix 64 bit build, cannot mix code and data declarations.

Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
---

diff --git a/xen/arch/x86/platform_hypercall.c b/xen/arch/x86/platform_hypercall.c
index 6228ea9671..24568db224 100644
--- a/xen/arch/x86/platform_hypercall.c
+++ b/xen/arch/x86/platform_hypercall.c
@@ -137,6 +137,9 @@ ret_t do_platform_op(XEN_GUEST_HANDLE(xen_platform_op_t) u_xenpf_op)
     case XENPF_microcode_update:
     {
         extern int microcode_update(XEN_GUEST_HANDLE(void), unsigned long len);
+#ifdef COMPAT
+        XEN_GUEST_HANDLE(void) data;
+#endif
 
         ret = xsm_microcode();
         if ( ret )
@@ -146,8 +149,6 @@ ret_t do_platform_op(XEN_GUEST_HANDLE(xen_platform_op_t) u_xenpf_op)
         ret = microcode_update(op->u.microcode.data,
                                op->u.microcode.length);
 #else
-        XEN_GUEST_HANDLE(void) data;
-
         guest_from_compat_handle(data, op->u.microcode.data);
         ret = microcode_update(data, op->u.microcode.length);
 #endif